From: Jeroen van der Heijden <jeroen@transceptor.technology>
Date: Fri, 12 Oct 2018 17:01:19 +0000 (+0200)
Subject: Upd readme
X-Git-Tag: archive/raspbian/2.0.44-1+rpi1~1^2~3^2~8^2~8
X-Git-Url: https://dgit.raspbian.org/%22http://www.example.com/cgi/success//%22http:/www.example.com/cgi/success/?a=commitdiff_plain;h=42998c626cf45f224913f680a7c47d91e5d0a916;p=siridb-server.git

Upd readme
---

diff --git a/README.md b/README.md
index dffb6356..a74091eb 100644
--- a/README.md
+++ b/README.md
@@ -9,6 +9,8 @@ SiriDB is a highly-scalable, robust and super fast time series database.
       * [Linux](#linux)
       * [OSX](#osx)
       * [Configuration](#configuration)
+    * [Build Debian package](#build-debian-package)
+    * [Run integration tests](#run-integration-tests)
   * [Create or expand a database](#create-or-expand-a-database)
   * [Using SiriDB](#using-siridb)
     * [SiriDB Connectors](#siridb-connectors)
@@ -47,17 +49,10 @@ Compile (replace Release with Debug for a debug build):
 ```
 cd ./Release
 make clean
+make test
 make
 ```
 
-Build Debian packages:
-
-```
-apt-get install devscripts lintian
-git archive -o ../siridb-server_2.0.29.orig.tar.gz master
-debuild -us -uc
-```
-
 #### OSX
 Install the following requirements:
 ```
@@ -71,18 +66,54 @@ cd ./Release
 export CFLAGS="-I/usr/local/include"
 export LDFLAGS="-L/usr/local/lib"
 make clean
+make test
 make
 ```
+
 #### Configuration
 SiriDB requires a configuration file to run. By default SiriDB will search for the configuration file in `/etc/siridb/siridb.conf` but alternatively you can specify a custom path by using the `-c/--config` argument.
 
 ```
 $ siridb-server -c /my/path/siridb.conf
 ```
-
 An example configuration file can be found here:
 [https://github.com/SiriDB/siridb-server/blob/master/siridb.conf](https://github.com/SiriDB/siridb-server/blob/master/siridb.conf)
 
+### Build Debian package:
+
+Install required packages (*autopkgtest is required for running the tests*)
+```
+apt-get install devscripts lintian help2man autopkgtest
+```
+
+Create archive
+```
+git archive -o ../siridb-server_2.0.30.orig.tar.gz master
+```
+
+Run tests
+```
+autopkgtest -B -- null
+```
+
+Build package
+```
+debuild -us -uc
+```
+
+## Run integration tests
+The simplest way to run the integration tests is to use [docker](https://docs.docker.com/install/).
+
+Build integration test image
+```
+docker build -t siridb/itest -f itest/Dockerfile .
+```
+
+Run integration tests
+```
+docker run siridb/itest:latest
+```
+
 ## Create or expand a database
 [SiriDB Admin](https://github.com/SiriDB/siridb-admin) is required for creating a new database or expanding an existing database with a new server. Documentation on how to install and use the admin tool can be found at the [siridb-admin](https://github.com/SiriDB/siridb-admin#readme) github project. Binaries are available for most platforms and can be downloaded from [here](https://github.com/SiriDB/siridb-admin/releases/latest).
 
@@ -109,14 +140,3 @@ When not using one of the above, you can still communicate to SiriDB using [Siri
 
 ## Query language
 Documentation about the query language can be found at https://siridb.net/documentation.
-
-## Integration testing
-Build integration test image
-```
-docker build -t siridb/itest -f itest/Dockerfile .
-```
-
-Run integration tests
-```
-docker run siridb/itest:latest
-```
\ No newline at end of file
diff --git a/debian/changelog b/debian/changelog
index cf2cc564..79f64e02 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,3 @@
-siridb-server (2.0.30-alpha2) unstable; urgency=medium
-
-  * Test
-
- -- Jeroen van der Heijden <jeroen@transceptor.technology>  Fri, 12 Oct 2018 16:05:40 +0200
-
 siridb-server (2.0.29-1) unstable; urgency=medium
 
   * New upstream release
diff --git a/main.c b/main.c
index 085004db..2d55d759 100644
--- a/main.c
+++ b/main.c
@@ -22,10 +22,7 @@
 
 int main(int argc, char * argv[])
 {
-    /*
-     * set local to LC_ALL
-     * more info at: http://www.cprogramming.com/tutorial/unicode.html
-     */
+    /* set local to LC_ALL */
     (void) setlocale(LC_ALL, "");
 
     /* initialize random */